merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 7 Sep 2011 04:02:15 +0000 (13:02 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 7 Sep 2011 04:02:15 +0000 (13:02 +0900)
commit888e3b8c2468e9058aa47ebe415a2a7d58dbc975
tree62bae95a8a7645a70449d429e3b22c22a7819fb8
parentc29c577d9032d11612a2a96c9a1d66853269e199
parent2900583b1abbf8efba5527d284f732a17810aba9
merge trunk